diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php
index ffd664a..6b1d5ea 100644
--- a/system/libraries/Profiler.php
+++ b/system/libraries/Profiler.php
@@ -123,7 +123,7 @@
 				foreach ($this->CI->db->queries as $val)
 				{
 					$output .= '<div style="padding:3px;margin:12px 0 12px 0;background-color:#ddd;color:#000">';
-					$output .= $val;
+					$output .= htmlspecialchars($val, ENT_QUOTES);
 					$output .= "</div>\n";
 				}	
 			}
@@ -166,7 +166,7 @@
 				}
 			
 //				$output .= "<tr><td width='50%' style='color:#000;background-color:#ddd;'>&#36;_POST[".$key."]&nbsp;&nbsp;</td><td width='50%' style='color:#009900;font-weight:normal;background-color:#ddd;'>".htmlspecialchars(stripslashes($val))."</td></tr>\n";
-				$output .= "<tr><td width='50%' style='color:#000;background-color:#ddd;'>".$_POST[$key]." </td><td width='50%' style='color:#009900;font-weight:normal;background-color:#ddd;'>";
+				$output .= "<tr><td width='50%' style='color:#000;background-color:#ddd;'>&#36;_POST[".$key."]&nbsp;&nbsp; </td><td width='50%' style='color:#009900;font-weight:normal;background-color:#ddd;'>";
 				if (is_array($val))
 				{
 					$output .= "<pre>" . htmlspecialchars(stripslashes(print_r($val, true))) . "</pre>";